From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 12 Feb 2013 15:26:15 +0000 (+0100)
Subject: - updated to 2.24.15
X-Git-Tag: auto/th/gtk+2-2.24.16-1~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi/packages/gtk%202.git/commitdiff/999541fbcdebca9869a7b6e76d011ac24dbc2436?a=commitdiff_plain;h=999541fbcdebca9869a7b6e76d011ac24dbc2436;p=packages%2Fgtk%2B2.git

- updated to 2.24.15
- removed obsolete cups-auth,am patches
---

diff --git a/cups-auth.patch b/cups-auth.patch
deleted file mode 100644
index f0f2e38..0000000
--- a/cups-auth.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -ur gtk+-3.2.2/modules/printbackends/cups.orig/gtkcupsutils.c gtk+-3.2.2/modules/printbackends/cups/gtkcupsutils.c
---- gtk+-3.2.2/modules/printbackends/cups.orig/gtkcupsutils.c	2011-11-07 19:47:37.000000000 +0100
-+++ gtk+-3.2.2/modules/printbackends/cups/gtkcupsutils.c	2011-11-23 11:50:56.413671604 +0100
-@@ -265,6 +265,10 @@
-       else if (request->type == GTK_CUPS_GET)
-         get_states[request->state] (request);
- 
-+      if (gtk_cups_result_is_error (request->result)) {
-+          request->state = GTK_CUPS_REQUEST_DONE;
-+      }
-+
-       if (request->attempts > _GTK_CUPS_MAX_ATTEMPTS &&
-           request->state != GTK_CUPS_REQUEST_DONE)
-         {
-@@ -918,8 +922,8 @@
-  * The callback sets cups_password to NULL to signal that the 
-  * password has been used.
-  */
--static char *cups_password;
--static char *cups_username;
-+static char *cups_password = NULL;
-+static char *cups_username = NULL;
- 
- static const char *
- passwordCB (const char *prompt)
-@@ -955,6 +959,7 @@
- 
-       if (request->password_state == GTK_CUPS_PASSWORD_APPLIED)
-         {
-+          request->poll_state = GTK_CUPS_HTTP_IDLE;
-           request->password_state = GTK_CUPS_PASSWORD_NOT_VALID;
-           request->state = GTK_CUPS_POST_AUTH;
-           request->need_password = TRUE;
-@@ -972,7 +976,6 @@
-         {
-           if (request->password_state == GTK_CUPS_PASSWORD_NONE)
-             {
--              cups_password = g_strdup ("");
-               cups_username = request->username;
-               cupsSetPasswordCB (passwordCB);
- 
-@@ -984,6 +987,7 @@
-                   /* move to AUTH state to let the backend 
-                    * ask for a password
-                    */ 
-+                  request->poll_state = GTK_CUPS_HTTP_IDLE;
-                   request->state = GTK_CUPS_POST_AUTH;
-                   request->need_password = TRUE;
- 
-@@ -1247,6 +1287,7 @@
- 
-       if (request->password_state == GTK_CUPS_PASSWORD_APPLIED)
-         {
-+          request->poll_state = GTK_CUPS_HTTP_IDLE;
-           request->password_state = GTK_CUPS_PASSWORD_NOT_VALID;
-           request->state = GTK_CUPS_GET_AUTH;
-           request->need_password = TRUE;
-@@ -1264,7 +1311,6 @@
-         {
-           if (request->password_state == GTK_CUPS_PASSWORD_NONE)
-             {
--              cups_password = g_strdup ("");
-               cups_username = request->username;
-               cupsSetPasswordCB (passwordCB);
- 
-@@ -1284,6 +1331,7 @@
-                   /* move to AUTH state to let the backend
-                    * ask for a password
-                    */
-+                  request->poll_state = GTK_CUPS_HTTP_IDLE;
-                   request->state = GTK_CUPS_GET_AUTH;
-                   request->need_password = TRUE;
- 
-@@ -1324,7 +1385,7 @@
-           return;
-         }
- 
--      request->state = GTK_CUPS_GET_SEND;
-+      request->state = GTK_CUPS_GET_CONNECT;
-       request->last_status = HTTP_CONTINUE;
- 
-      return;
diff --git a/gtk+2-am.patch b/gtk+2-am.patch
deleted file mode 100644
index 66c535f..0000000
--- a/gtk+2-am.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtk+-2.24.14/configure.in.orig	2012-12-06 04:46:07.000000000 +0100
-+++ gtk+-2.24.14/configure.in	2013-01-05 23:22:13.182460350 +0100
-@@ -51,7 +51,7 @@
- cflags_set=${CFLAGS+set}
- 
- AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- # Support silent build rules, requires at least automake-1.11. Enable
- # by either passing --enable-silent-rules to configure or passing V=0
-@@ -300,7 +300,7 @@
- 
- # Checks for programs.
- AC_ISC_POSIX
--AM_PROG_CC_STDC
-+AC_PROG_CC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
diff --git a/gtk+2.spec b/gtk+2.spec
index 071b3ae..ee49a91 100644
--- a/gtk+2.spec
+++ b/gtk+2.spec
@@ -14,18 +14,16 @@ Summary(it.UTF-8):	Il toolkit per GIMP
 Summary(pl.UTF-8):	GIMP Toolkit
 Summary(tr.UTF-8):	GIMP ToolKit arayüz kitaplığı
 Name:		gtk+2
-Version:	2.24.14
-Release:	2
+Version:	2.24.15
+Release:	1
 Epoch:		2
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-%{version}.tar.xz
-# Source0-md5:	e2c16f119ed624893ecfc3775930ae4c
+# Source0-md5:	68f034fb4f68086790d7488cf00e71c8
 Patch0:		%{name}-arch_confdir.patch
 Patch1:		gobject-introspection.patch
 Patch2:		%{name}-papi.patch
-Patch3:		cups-auth.patch
-Patch4:		%{name}-am.patch
 URL:		http://www.gtk.org/
 BuildRequires:	atk-devel >= 1:1.30.0-3
 BuildRequires:	autoconf >= 2.62
@@ -251,8 +249,6 @@ Moduł GTK+ do drukowania przez PAPI.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' gtk/gtk-builder-convert